From a70fca529beca4724d235653399cee611db8e870 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 12 Jul 2001 20:59:42 +0000 Subject: [PATCH] Replace a couple of inappropriate calls to GTK_WIDGET_HAS_FOCUS() with Thu Jul 12 16:51:34 2001 Owen Taylor * gtk/gtkwidget.c: Replace a couple of inappropriate calls to GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkwidget.c | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b0fe0d9b42..42496c31d9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Jul 12 16:51:34 2001 Owen Taylor + + * gtk/gtkwidget.c: Replace a couple of inappropriate calls to + GTK_WIDGET_HAS_FOCUS() with gtk_widget_is_focus(). (#57067) + Thu Jul 12 14:06:19 2001 Owen Taylor * gtk/gtkmenubar.c (gtk_menu_bar_hierarchy_changed): Add diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index d15c4e2c8a..05b24dcabe 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -3158,7 +3158,7 @@ gtk_widget_real_focus (GtkWidget *widget, if (!GTK_WIDGET_CAN_FOCUS (widget)) return FALSE; - if (!GTK_WIDGET_HAS_FOCUS (widget)) + if (!gtk_widget_is_focus (widget)) { gtk_widget_grab_focus (widget); return TRUE; @@ -5382,7 +5382,7 @@ gtk_widget_propagate_state (GtkWidget *widget, GTK_WIDGET_STATE (widget) = GTK_STATE_INSENSITIVE; } - if (GTK_WIDGET_HAS_FOCUS (widget) && !GTK_WIDGET_IS_SENSITIVE (widget)) + if (gtk_widget_is_focus (widget) && !GTK_WIDGET_IS_SENSITIVE (widget)) { GtkWidget *window; -- 2.30.2